Fix Android Errors